Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_REALIZED)

Use new API instead: gtk_widget_set_realized ()

https://bugzilla.gnome.org/show_bug.cgi?id=69872

diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index b6c741bddb71b4c967bfc64fbd920a4cf18635fa..6ff212f5b0bbafc5c8ffbb99a8397cc5a3656cf0 100644 (file)
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -229,7 +229,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 

diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index 8f1089406a1e4610c49d01a595e49b42bea6fac0..3ee3630d031eb3b35f1e03e60c2ba4c110d1dc61 100644 (file)
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -167,7 +167,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 

diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index c92a550f9eb63a13b7af86b2e730cf0d6d5015a1..3eee1bd31cd52449f98f0af3a926659fe6c61bab 100755 (executable)
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -11925,7 +11925,7 @@ gtk_dial_realize (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_DIAL (widget));
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   dial = GTK_DIAL (widget);
 
   attributes.x = widget->allocation.x;
@@ -15113,7 +15113,7 @@ gtk_dial_realize (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_DIAL (widget));
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   dial = GTK_DIAL (widget);
 
   attributes.x = widget->allocation.x;

diff --git a/examples/gtkdial/gtkdial.c b/examples/gtkdial/gtkdial.c
index f5d8c3b3aee46368b4743bc97a1ab618b4a00f2e..31f51c040be4e8806f3bce717589bdbb13fca2bf 100644 (file)
--- a/examples/gtkdial/gtkdial.c
+++ b/examples/gtkdial/gtkdial.c
@@ -214,7 +214,7 @@ gtk_dial_realize (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_DIAL (widget));
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   dial = GTK_DIAL (widget);
 
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 9f359c4d87cf5347b4fc046cadb2170908b3032d..47819ce668080d4a50d369974466dfa01c0b1e82 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1175,7 +1175,7 @@ gtk_button_realize (GtkWidget *widget)
   gint border_width;
 
   button = GTK_BUTTON (widget);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 3b275656a8d188377e6b7c3720f9f0c0b945e377..37d55c3c3f712f999879b716d6fa0b81452501cd 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1572,7 +1572,7 @@ gtk_calendar_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 661bda88f57cc74781dd8b9543002815f28ded33..08216ae2f7af60ce57e862e25acccf2d6a2eaccb 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4458,7 +4458,7 @@ gtk_clist_realize (GtkWidget *widget)
 
   clist = GTK_CLIST (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
   

diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 4b4dfdea4c0e79e0cf57dd4d6105e597e63f8d6f..fa7d8b44b61c17757c1748620e13fff6bdd5fed2 100644 (file)
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -85,7 +85,7 @@ gtk_drawing_area_realize (GtkWidget *widget)
     }
   else
     {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+      gtk_widget_set_realized (widget, TRUE);
 
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.x = widget->allocation.x;

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index f132753220efd2a85430ce80c87583cdf5981a7d..c4aeb66c2549056a22211872d15708d0d9c008e7 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2753,7 +2753,7 @@ gtk_entry_realize (GtkWidget *widget)
   gint attributes_mask;
   int i;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   entry = GTK_ENTRY (widget);
   priv = GTK_ENTRY_GET_PRIVATE (entry);
 

diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index 7ac4f38ae4983d292e7f8e429c7f110865fcc3b5..bb334e154f3aa424c1fd11e31cd2d86fb17c2574 100644 (file)
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -372,7 +372,7 @@ gtk_event_box_realize (GtkWidget *widget)
   GtkEventBoxPrivate *priv;
   gboolean visible_window;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
   

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index eb474041f4d544bf2ca73d6808e26901295fde22..df64e54804c15c2aadbbf6c9099c47c39532814b 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -403,7 +403,7 @@ gtk_expander_realize (GtkWidget *widget)
   gint label_height;
 
   priv = GTK_EXPANDER (widget)->priv;
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 

diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index c915bb427ae8b151bb2968b5ad84cb0c06bf77d4..3106e1f000c7d63502aa32c360cad857b89ac8fd 100644 (file)
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -277,7 +277,7 @@ gtk_fixed_realize (GtkWidget *widget)
     GTK_WIDGET_CLASS (gtk_fixed_parent_class)->realize (widget);
   else
     {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+      gtk_widget_set_realized (widget, TRUE);
 
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.x = widget->allocation.x;

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 720d7fcc3180299ef4fa05931e6273f98a21f33f..b3e12d3124b5b07bc4e4224ad5104fcbec0d2a18 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -394,7 +394,7 @@ gtk_handle_box_realize (GtkWidget *widget)
 
   hb = GTK_HANDLE_BOX (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 704b69e7ed94139d95b5dc4eeac1f130eda2041b..a9b4bb5ce0456ee7b60065b764d4f176cdbb5ce1 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -279,7 +279,7 @@ gtk_hsv_realize (GtkWidget *widget)
   hsv = GTK_HSV (widget);
   priv = hsv->priv;
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   /* Create window */
   

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 74eaacd4b230ce5d263c38eee68acd57b945270c..24718bdb59b4b30ae3b0750ae2f78764bbb1c4a0 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1318,7 +1318,7 @@ gtk_icon_view_realize (GtkWidget *widget)
   
   icon_view = GTK_ICON_VIEW (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   /* Make the main, clipping window */
   attributes.window_type = GDK_WINDOW_CHILD;

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 0ca218dfa9c94ff81249d8ddfddf7855adf45576..c24487cb539c3da088de1dad3e228dcff90cb420 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -218,7 +218,7 @@ gtk_invisible_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   parent = gtk_widget_get_parent_window (widget);
   if (parent == NULL)

diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index cc5e3df0b48499c1ec533eb423084586b5d0f9b7..b21c1e5fc1d09237fa9b3ba2aff657b997a83c69 100644 (file)
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -125,7 +125,7 @@ gtk_item_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 6f74e644fa290fa9cbbff72372bfda89314e5206..be7917bd37596c3af22efb42937ff77995e1cd41 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -847,7 +847,7 @@ gtk_layout_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 11a643d25b1f8a3c9f8f5c691517bda220177a8c..29a0c637d9ca3079063050576113632d8d52bb59 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -451,7 +451,7 @@ gtk_list_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 68c9e92da63630a28885a7c58d93eee7e49f4f5f..d01346259c791e39df7676dd2f64e16faa7dca70 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -431,7 +431,7 @@ gtk_list_item_realize (GtkWidget *widget)
 
   g_return_if_fail (GTK_IS_LIST_ITEM (widget));
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 083c1334be8c657e6c92de216fa4aeebcd734858..cbc95adfc8ddc0c085655c23721b8c6936accbe6 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2263,7 +2263,7 @@ gtk_menu_realize (GtkWidget *widget)
 
   menu = GTK_MENU (widget);
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 4b262314419ed523801d39b8c5ba2a1183b41297..3d4749976e34551560852c26d7efddcb41b234f4 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1129,7 +1129,7 @@ gtk_menu_item_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   widget->window = gtk_widget_get_parent_window (widget);
   g_object_ref (widget->window);

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4a86b203761e26447269c8b19f89fee6d5df9db1..4788590700e91200c7e7785d57b52616ff867d09 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -513,7 +513,7 @@ gtk_menu_shell_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.x = widget->allocation.x;
   attributes.y = widget->allocation.y;

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index e625f38b13dfbc86a155db1a4082f8b27e6db653..93d8421837edb964f8e46454ec660181d559fc3a 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -308,7 +308,7 @@ gtk_misc_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   if (!gtk_widget_get_has_window (widget))
     {

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index fb3fa7d901d32b78b1554bffa34ba121a08fc457..a8e99db244ce4927deb267c81d9d4f0e04ff5300 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1798,7 +1798,8 @@ gtk_notebook_realize (GtkWidget *widget)
   GdkRectangle event_window_pos;
 
   notebook = GTK_NOTEBOOK (widget);
-  GTK_WIDGET_SET_FLAGS (notebook, GTK_REALIZED);
+
+  gtk_widget_set_realized (widget, TRUE);
 
   gtk_notebook_get_event_window_position (notebook, &event_window_pos);
   

diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index 78818e47a4add189f1028df89194525ce172381e..0633a787a32139bd702ae438c001bddc55717127 100644 (file)
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -125,7 +125,7 @@ gtk_offscreen_window_realize (GtkWidget *widget)
 
   bin = GTK_BIN (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 6fa46888c495f52bfc4754f454409f6aec4ce313..1e981637986c5e25d5df82829f9762386c7b324e 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -978,7 +978,7 @@ gtk_paned_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   paned = GTK_PANED (widget);
 
   widget->window = gtk_widget_get_parent_window (widget);

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 69d3b62c64317acc718b0ea3db8ab2ed77bb850e..48eec632d243146584cdec53460f38413100cc59 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -408,7 +408,7 @@ gtk_path_bar_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   path_bar = GTK_PATH_BAR (widget);
   widget->window = gtk_widget_get_parent_window (widget);

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 0ec3e65777e423e450581fc85608999f968a06c1..7863dfee504df6a57578ee1bdc9b0b8b4e660d6a 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -608,7 +608,7 @@ gtk_plug_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;   /* XXX GDK_WINDOW_PLUG ? */
   attributes.title = window->title;

diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index fa74ebdff5783e0a913ae4276570b9e7a49763e6..458fed4efecda0e0c9506853e97cafe607b6ecfa 100644 (file)
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -420,7 +420,7 @@ gtk_preview_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
 

diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index ef062bb6890db84fb4ec83a8d842e4acbf5e93d3..8f46de45dab79ae0f75087f0f472628696fe240d 100644 (file)
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -212,7 +212,7 @@ gtk_progress_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 85cb85f6814154b35c1616f924ff89cfb1a908f1..ab295b9f3922b29baa4598825e7f06999801c19c 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1495,7 +1495,7 @@ gtk_range_realize (GtkWidget *widget)
 
   gtk_range_calc_layout (range, range->adjustment->value);
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   widget->window = gtk_widget_get_parent_window (widget);
   g_object_ref (widget->window);

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index ae86b0b4984736926f3d32927b414015c26a7e91..d066775df9f547945bf91b43a881fce9846507d5 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -441,7 +441,8 @@ gtk_ruler_realize (GtkWidget *widget)
   gint attributes_mask;
 
   ruler = GTK_RULER (widget);
-  GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED);
+
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 2006024be8151fcef8ca6350c13424a84b3cf6ec..b19b4a5049bb5429ca161ee3620dec7736568f6c 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -336,7 +336,7 @@ gtk_socket_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;
@@ -400,7 +400,7 @@ gtk_socket_unrealize (GtkWidget *widget)
 {
   GtkSocket *socket = GTK_SOCKET (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, FALSE);
 
   if (socket->plug_widget)
     {

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 543bd2ca5316ede9993fc4dfe2a9c1f318740c32..5fdbb38d990e573c2bb2a72f7a12e39cb784451c 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1239,7 +1239,7 @@ gtk_text_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (text, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6f6259005576c82426662a56b0aab866201b9748..0504f59dbd11235f8d7204a2c5733b1b5a5da24d 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3827,7 +3827,8 @@ gtk_text_view_realize (GtkWidget *widget)
   GSList *tmp_list;
   
   text_view = GTK_TEXT_VIEW (widget);
-  GTK_WIDGET_SET_FLAGS (text_view, GTK_REALIZED);
+
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 36b0e9a2a673d8d726ef9a552ca33455e0e9868b..8f065a7f8aeee017e20b7ea120605f15872b5edb 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -813,7 +813,7 @@ gtk_toolbar_realize (GtkWidget *widget)
   gint attributes_mask;
   gint border_width;
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   border_width = GTK_CONTAINER (widget)->border_width;
   

diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index da2e45f1f4b5ed0ab0bc391387f1895cafeb3f79..606ce1e847fcfa51f72d665e0f131cd24102135b 100644 (file)
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -462,7 +462,7 @@ gtk_tool_item_realize (GtkWidget *widget)
   GtkToolItem *toolitem;
 
   toolitem = GTK_TOOL_ITEM (widget);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   widget->window = gtk_widget_get_parent_window (widget);
   g_object_ref (widget->window);

diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 7f1db34e28883299710f3a734781f24c945699d4..ecff531c459c26eda64b383213bdf61392fbe86c 100644 (file)
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1181,7 +1181,7 @@ gtk_tool_item_group_realize (GtkWidget *widget)
   gdk_window_set_user_data (widget->window, widget);
   widget->style = gtk_style_attach (widget->style, widget->window);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   gtk_container_forall (GTK_CONTAINER (widget),
                         (GtkCallback) gtk_widget_set_parent_window,

diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 94ea45247b41a11f194d506ce6815ef8d1583416..e7b94007a76142712e331575a685269d75b2eda5 100644 (file)
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -672,7 +672,7 @@ gtk_tool_palette_realize (GtkWidget *widget)
   gdk_window_set_user_data (widget->window, widget);
   widget->style = gtk_style_attach (widget->style, widget->window);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   gtk_container_forall (GTK_CONTAINER (widget),
                         (GtkCallback) gtk_widget_set_parent_window,

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index f3e6f7f36dab0c1c77013e5dbe7206bd3c2806fb..1ac137a98b3c9e66ec3862f459c2e0bd514028a1 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -560,7 +560,7 @@ gtk_tree_realize (GtkWidget *widget)
   
   g_return_if_fail (GTK_IS_TREE (widget));
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 045bfddc4361092568fde657469218441aa5f0a2..4dc48183a051190686404acf71cf4b954de0674a 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1771,7 +1771,7 @@ gtk_tree_view_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   /* Make the main, clipping window */
   attributes.window_type = GDK_WINDOW_CHILD;

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index e36ae687b600919f84a7f984eff32f7d1ccac9e6..bfda9f28bf37c287649a5e8da70ff1cdfb5ae19b 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -588,7 +588,7 @@ gtk_viewport_realize (GtkWidget *widget)
   gint attributes_mask;
   gint event_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index bd46ab7f6a6286ef0358764e03bc81e5f6000cab..81113157218c1e469442430fe4b8bd1becd0c2b9 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6004,9 +6004,9 @@ gtk_widget_set_realized (GtkWidget *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (realized)
-    GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+    GTK_OBJECT_FLAGS (widget) |= GTK_REALIZED;
   else
-    GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+    GTK_OBJECT_FLAGS (widget) &= ~(GTK_REALIZED);
 }
 
 /**
@@ -8808,7 +8808,7 @@ gtk_widget_real_realize (GtkWidget *widget)
 {
   g_assert (!gtk_widget_get_has_window (widget));
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   if (widget->parent)
     {
       widget->window = gtk_widget_get_parent_window (widget);
@@ -8862,7 +8862,7 @@ gtk_widget_real_unrealize (GtkWidget *widget)
 
   gtk_selection_remove_all (widget);
   
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, FALSE);
 }
 
 static void

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 7604923bb322861b53b141f2f6a4f5bbae304337..e710a8bfe25c1aeccca7f0bd08053ba7be41a40a 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -200,7 +200,7 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
       g_return_if_fail (!gtk_widget_get_realized (widget));
     }
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.title = window->title;

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8d05b77b1bc697875987bf461a8f830e361a16a9..577f672c55d8c69d6d16b1eed4d40dd8be9d6438 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4742,7 +4742,7 @@ gtk_window_realize (GtkWidget *widget)
       g_return_if_fail (!gtk_widget_get_realized (widget));
     }
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
   
   switch (window->type)
     {

diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c
index 760810ceb8e2f1527db9c9f60b6a523b8bde5c48..b6caa14c8baf70ebbec91ae89343feb3ba105898 100644 (file)
--- a/tests/gtkoffscreenbox.c
+++ b/tests/gtkoffscreenbox.c
@@ -238,7 +238,7 @@ gtk_offscreen_box_realize (GtkWidget *widget)
   GtkRequisition child_requisition;
   int start_y = 0;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;